From 09d19b0f64655d57927055a842902b634e25efea Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 1 May 2010 20:03:42 -0700 Subject: [PATCH] Update info related dependencies according to Debian Policy (12.2). * Update emacsFLAVOR-common dpkg dependency to require "dpkg (>= 1.15.4) | install-info" for proper info page handling (Debian Policy 12.2), and remove install-info dependency from packages without info files. --- debian/changelog | 7 ++++++- debian/control | 8 ++++---- debian/control.in | 8 ++++---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ef2aa464fc..1a9a2502bc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,12 @@ emacs23 (23.1+1-7) unstable; urgency=low * Change debian/rules to use "dh $@" approach. - -- Rob Browning Sat, 01 May 2010 19:13:17 -0700 + * Update emacsFLAVOR-common dpkg dependency to require "dpkg (>= + 1.15.4) | install-info" for proper info page handling (Debian + Policy 12.2), and remove install-info dependency from packages + without info files. + + -- Rob Browning Sat, 01 May 2010 19:48:11 -0700 emacs23 (23.1+1-6) unstable; urgency=low diff --git a/debian/control b/debian/control index 58953dafe82..b7a14c6a285 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Package: emacs23-lucid Section: editors Priority: optional Architecture: any -Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends} +Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: emacs23, emacsen, editor, info-browser, mail-reader, news-reader Suggests: emacs23-common-non-dfsg Conflicts: emacs23, emacs23-nox, emacs23-gtk @@ -33,7 +33,7 @@ Package: emacs23-nox Section: editors Priority: optional Architecture: any -Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends} +Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader Suggests: emacs23-common-non-dfsg Conflicts: emacs23, emacs23-lucid, emacs23-gtk @@ -46,7 +46,7 @@ Package: emacs23 Section: editors Priority: optional Architecture: any -Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends} +Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: editor, emacsen, info-browser, mail-reader, news-reader, emacs23-gtk Suggests: emacs23-common-non-dfsg Conflicts: emacs23-lucid, emacs23-nox, emacs23-gtk @@ -69,7 +69,7 @@ Package: emacs23-common Section: editors Priority: optional Architecture: all -Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends} +Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends} Suggests: emacs23-el, emacs23-common-non-dfsg Conflicts: emacs23-el (<< ${Source-Version}) Description: The GNU Emacs editor's shared, architecture independent infrastructure diff --git a/debian/control.in b/debian/control.in index c0b3878efcd..04f58ba84b5 100644 --- a/debian/control.in +++ b/debian/control.in @@ -20,7 +20,7 @@ Package: @DEB_FLAVOR@-lucid Section: editors Priority: optional Architecture: any -Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends} +Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: @DEB_FLAVOR@, emacsen, editor, info-browser, mail-reader, news-reader Suggests: @DEB_FLAVOR@-common-non-dfsg Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, emacs23-gtk @@ -33,7 +33,7 @@ Package: @DEB_FLAVOR@-nox Section: editors Priority: optional Architecture: any -Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends} +Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader Suggests: @DEB_FLAVOR@-common-non-dfsg Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, emacs23-gtk @@ -46,7 +46,7 @@ Package: @DEB_FLAVOR@ Section: editors Priority: optional Architecture: any -Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends} +Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: editor, emacsen, info-browser, mail-reader, news-reader, emacs23-gtk Suggests: @DEB_FLAVOR@-common-non-dfsg Conflicts: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox, emacs23-gtk @@ -69,7 +69,7 @@ Package: @DEB_FLAVOR@-common Section: editors Priority: optional Architecture: all -Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends} +Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends} Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}) Description: The GNU Emacs editor's shared, architecture independent infrastructure -- 2.30.2